Use gdk_window_get_toplevel(), as it is the top-level windows that are

2002-03-20  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use
	gdk_window_get_toplevel(), as it is the top-level windows that are
	registered for DND.

	* gdk/win32/gdkwin32.h: Don't include gdkinternals.h.

diff --git a/ChangeLog b/ChangeLog
index 3e0bc047e361bb2f618873edff7f0772b98c994d..632697786b4ca62d1afdc68235a4865df03090bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-20  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use
+       gdk_window_get_toplevel(), as it is the top-level windows that are
+       registered for DND.
+
+       * gdk/win32/gdkwin32.h: Don't include gdkinternals.h.
+
 2002-03-19  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3e0bc047e361bb2f618873edff7f0772b98c994d..632697786b4ca62d1afdc68235a4865df03090bd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2002-03-20  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use
+       gdk_window_get_toplevel(), as it is the top-level windows that are
+       registered for DND.
+
+       * gdk/win32/gdkwin32.h: Don't include gdkinternals.h.
+
 2002-03-19  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3e0bc047e361bb2f618873edff7f0772b98c994d..632697786b4ca62d1afdc68235a4865df03090bd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2002-03-20  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use
+       gdk_window_get_toplevel(), as it is the top-level windows that are
+       registered for DND.
+
+       * gdk/win32/gdkwin32.h: Don't include gdkinternals.h.
+
 2002-03-19  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3e0bc047e361bb2f618873edff7f0772b98c994d..632697786b4ca62d1afdc68235a4865df03090bd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2002-03-20  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use
+       gdk_window_get_toplevel(), as it is the top-level windows that are
+       registered for DND.
+
+       * gdk/win32/gdkwin32.h: Don't include gdkinternals.h.
+
 2002-03-19  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3e0bc047e361bb2f618873edff7f0772b98c994d..632697786b4ca62d1afdc68235a4865df03090bd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2002-03-20  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use
+       gdk_window_get_toplevel(), as it is the top-level windows that are
+       registered for DND.
+
+       * gdk/win32/gdkwin32.h: Don't include gdkinternals.h.
+
 2002-03-19  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3e0bc047e361bb2f618873edff7f0772b98c994d..632697786b4ca62d1afdc68235a4865df03090bd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2002-03-20  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use
+       gdk_window_get_toplevel(), as it is the top-level windows that are
+       registered for DND.
+
+       * gdk/win32/gdkwin32.h: Don't include gdkinternals.h.
+
 2002-03-19  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when

diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index b1b712583212703a34999dcd355bc507a28bd980..f440baf6b8f5de7195a591262612cadb73020a00 100644 (file)
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -1336,7 +1336,10 @@ gdk_drag_find_window (GdkDragContext  *context,
     {
       *dest_window = gdk_win32_handle_table_lookup (GPOINTER_TO_UINT(recipient));
       if (*dest_window)
-       gdk_drawable_ref (*dest_window);
+       {
+         *dest_window = gdk_window_get_toplevel (*dest_window);
+         gdk_drawable_ref (*dest_window);
+       }
 
       if (context->source_window)
         *protocol = GDK_DRAG_PROTO_LOCAL;

diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h
index ee11e58952ba698c04d11c0e66325f170c3b1eb0..bae4708adbdb7871459582261822fce1f63616b8 100644 (file)
--- a/gdk/win32/gdkwin32.h
+++ b/gdk/win32/gdkwin32.h
@@ -28,7 +28,6 @@
 #define __GDK_WIN32_H__
 
 #include <gdk/gdkprivate.h>
-#include <gdk/gdkinternals.h>
 #include <gdk/gdkcursor.h>
 
 #ifndef STRICT